Autogenerated HTML docs for v2.21.0-419-gffac5
diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt index b8cfeec..d64e724 100644 --- a/git-cherry-pick.txt +++ b/git-cherry-pick.txt
@@ -148,6 +148,11 @@ Pass the merge strategy-specific option through to the merge strategy. See linkgit:git-merge[1] for details. +--rerere-autoupdate:: +--no-rerere-autoupdate:: + Allow the rerere mechanism to update the index with the + result of auto-conflict resolution if possible. + SEQUENCER SUBCOMMANDS --------------------- include::sequencer.txt[]
